Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 11 Jan 2012 19:12:06 +0000 (11:12 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 11 Jan 2012 19:12:06 +0000 (11:12 -0800)

Trivial merge